_STD -> _VSTD to avoid macro clash on windows git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@134190 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/__bit_reference b/include/__bit_reference index 0b006dc..57b92ea 100644 --- a/include/__bit_reference +++ b/include/__bit_reference
@@ -142,25 +142,25 @@ if (__first.__ctz_ != 0) { __storage_type __clz_f = static_cast<__storage_type>(__bits_per_word - __first.__ctz_); - __storage_type __dn = _STD::min(__clz_f, __n); + __storage_type __dn = _VSTD::min(__clz_f, __n); __storage_type __m = (~__storage_type(0) << __first.__ctz_) & (~__storage_type(0) >> (__clz_f - __dn)); __storage_type __b = *__first.__seg_ & __m; if (__b) - return _It(__first.__seg_, static_cast<unsigned>(_STD::__ctz(__b))); + return _It(__first.__seg_, static_cast<unsigned>(_VSTD::__ctz(__b))); __n -= __dn; ++__first.__seg_; } // do middle whole words for (; __n >= __bits_per_word; ++__first.__seg_, __n -= __bits_per_word) if (*__first.__seg_) - return _It(__first.__seg_, static_cast<unsigned>(_STD::__ctz(*__first.__seg_))); + return _It(__first.__seg_, static_cast<unsigned>(_VSTD::__ctz(*__first.__seg_))); // do last partial word if (__n > 0) { __storage_type __m = ~__storage_type(0) >> (__bits_per_word - __n); __storage_type __b = *__first.__seg_ & __m; if (__b) - return _It(__first.__seg_, static_cast<unsigned>(_STD::__ctz(__b))); + return _It(__first.__seg_, static_cast<unsigned>(_VSTD::__ctz(__b))); } return _It(__first.__seg_, static_cast<unsigned>(__n)); } @@ -176,11 +176,11 @@ if (__first.__ctz_ != 0) { __storage_type __clz_f = static_cast<__storage_type>(__bits_per_word - __first.__ctz_); - __storage_type __dn = _STD::min(__clz_f, __n); + __storage_type __dn = _VSTD::min(__clz_f, __n); __storage_type __m = (~__storage_type(0) << __first.__ctz_) & (~__storage_type(0) >> (__clz_f - __dn)); __storage_type __b = ~(*__first.__seg_ & __m); if (__b) - return _It(__first.__seg_, static_cast<unsigned>(_STD::__ctz(__b))); + return _It(__first.__seg_, static_cast<unsigned>(_VSTD::__ctz(__b))); __n -= __dn; ++__first.__seg_; } @@ -189,7 +189,7 @@ { __storage_type __b = ~*__first.__seg_; if (__b) - return _It(__first.__seg_, static_cast<unsigned>(_STD::__ctz(__b))); + return _It(__first.__seg_, static_cast<unsigned>(_VSTD::__ctz(__b))); } // do last partial word if (__n > 0) @@ -197,7 +197,7 @@ __storage_type __m = ~__storage_type(0) >> (__bits_per_word - __n); __storage_type __b = ~(*__first.__seg_ & __m); if (__b) - return _It(__first.__seg_, static_cast<unsigned>(_STD::__ctz(__b))); + return _It(__first.__seg_, static_cast<unsigned>(_VSTD::__ctz(__b))); } return _It(__first.__seg_, static_cast<unsigned>(__n)); } @@ -227,20 +227,20 @@ if (__first.__ctz_ != 0) { __storage_type __clz_f = static_cast<__storage_type>(__bits_per_word - __first.__ctz_); - __storage_type __dn = _STD::min(__clz_f, __n); + __storage_type __dn = _VSTD::min(__clz_f, __n); __storage_type __m = (~__storage_type(0) << __first.__ctz_) & (~__storage_type(0) >> (__clz_f - __dn)); - __r = _STD::__pop_count(*__first.__seg_ & __m); + __r = _VSTD::__pop_count(*__first.__seg_ & __m); __n -= __dn; ++__first.__seg_; } // do middle whole words for (; __n >= __bits_per_word; ++__first.__seg_, __n -= __bits_per_word) - __r += _STD::__pop_count(*__first.__seg_); + __r += _VSTD::__pop_count(*__first.__seg_); // do last partial word if (__n > 0) { __storage_type __m = ~__storage_type(0) >> (__bits_per_word - __n); - __r += _STD::__pop_count(*__first.__seg_ & __m); + __r += _VSTD::__pop_count(*__first.__seg_ & __m); } return __r; } @@ -258,20 +258,20 @@ if (__first.__ctz_ != 0) { __storage_type __clz_f = static_cast<__storage_type>(__bits_per_word - __first.__ctz_); - __storage_type __dn = _STD::min(__clz_f, __n); + __storage_type __dn = _VSTD::min(__clz_f, __n); __storage_type __m = (~__storage_type(0) << __first.__ctz_) & (~__storage_type(0) >> (__clz_f - __dn)); - __r = _STD::__pop_count(~(*__first.__seg_ & __m)); + __r = _VSTD::__pop_count(~(*__first.__seg_ & __m)); __n -= __dn; ++__first.__seg_; } // do middle whole words for (; __n >= __bits_per_word; ++__first.__seg_, __n -= __bits_per_word) - __r += _STD::__pop_count(~*__first.__seg_); + __r += _VSTD::__pop_count(~*__first.__seg_); // do last partial word if (__n > 0) { __storage_type __m = ~__storage_type(0) >> (__bits_per_word - __n); - __r += _STD::__pop_count(~(*__first.__seg_ & __m)); + __r += _VSTD::__pop_count(~(*__first.__seg_ & __m)); } return __r; } @@ -299,7 +299,7 @@ if (__first.__ctz_ != 0) { __storage_type __clz_f = static_cast<__storage_type>(__bits_per_word - __first.__ctz_); - __storage_type __dn = _STD::min(__clz_f, __n); + __storage_type __dn = _VSTD::min(__clz_f, __n); __storage_type __m = (~__storage_type(0) << __first.__ctz_) & (~__storage_type(0) >> (__clz_f - __dn)); *__first.__seg_ &= ~__m; __n -= __dn; @@ -307,7 +307,7 @@ } // do middle whole words __storage_type __nw = __n / __bits_per_word; - _STD::memset(__first.__seg_, 0, __nw * sizeof(__storage_type)); + _VSTD::memset(__first.__seg_, 0, __nw * sizeof(__storage_type)); __n -= __nw * __bits_per_word; // do last partial word if (__n > 0) @@ -329,7 +329,7 @@ if (__first.__ctz_ != 0) { __storage_type __clz_f = static_cast<__storage_type>(__bits_per_word - __first.__ctz_); - __storage_type __dn = _STD::min(__clz_f, __n); + __storage_type __dn = _VSTD::min(__clz_f, __n); __storage_type __m = (~__storage_type(0) << __first.__ctz_) & (~__storage_type(0) >> (__clz_f - __dn)); *__first.__seg_ |= __m; __n -= __dn; @@ -337,7 +337,7 @@ } // do middle whole words __storage_type __nw = __n / __bits_per_word; - _STD::memset(__first.__seg_, -1, __nw * sizeof(__storage_type)); + _VSTD::memset(__first.__seg_, -1, __nw * sizeof(__storage_type)); __n -= __nw * __bits_per_word; // do last partial word if (__n > 0) @@ -369,7 +369,7 @@ void fill(__bit_iterator<_C, false> __first, __bit_iterator<_C, false> __last, bool __value) { - _STD::fill_n(__first, static_cast<typename _C::size_type>(__last - __first), __value); + _VSTD::fill_n(__first, static_cast<typename _C::size_type>(__last - __first), __value); } // copy @@ -390,7 +390,7 @@ if (__first.__ctz_ != 0) { unsigned __clz = __bits_per_word - __first.__ctz_; - difference_type __dn = _STD::min(static_cast<difference_type>(__clz), __n); + difference_type __dn = _VSTD::min(static_cast<difference_type>(__clz), __n); __n -= __dn; __storage_type __m = (~__storage_type(0) << __first.__ctz_) & (~__storage_type(0) >> (__clz - __dn)); __storage_type __b = *__first.__seg_ & __m; @@ -404,7 +404,7 @@ // __first.__ctz_ == 0; // do middle words __storage_type __nw = __n / __bits_per_word; - _STD::memmove(__result.__seg_, __first.__seg_, __nw * sizeof(__storage_type)); + _VSTD::memmove(__result.__seg_, __first.__seg_, __nw * sizeof(__storage_type)); __n -= __nw * __bits_per_word; __result.__seg_ += __nw; // do last word @@ -437,12 +437,12 @@ if (__first.__ctz_ != 0) { unsigned __clz_f = __bits_per_word - __first.__ctz_; - difference_type __dn = _STD::min(static_cast<difference_type>(__clz_f), __n); + difference_type __dn = _VSTD::min(static_cast<difference_type>(__clz_f), __n); __n -= __dn; __storage_type __m = (~__storage_type(0) << __first.__ctz_) & (~__storage_type(0) >> (__clz_f - __dn)); __storage_type __b = *__first.__seg_ & __m; unsigned __clz_r = __bits_per_word - __result.__ctz_; - __storage_type __ddn = _STD::min<__storage_type>(__dn, __clz_r); + __storage_type __ddn = _VSTD::min<__storage_type>(__dn, __clz_r); __m = (~__storage_type(0) << __result.__ctz_) & (~__storage_type(0) >> (__clz_r - __ddn)); *__result.__seg_ &= ~__m; if (__result.__ctz_ > __first.__ctz_) @@ -480,7 +480,7 @@ { __m = ~__storage_type(0) >> (__bits_per_word - __n); __storage_type __b = *__first.__seg_ & __m; - __storage_type __dn = _STD::min(__n, static_cast<difference_type>(__clz_r)); + __storage_type __dn = _VSTD::min(__n, static_cast<difference_type>(__clz_r)); __m = (~__storage_type(0) << __result.__ctz_) & (~__storage_type(0) >> (__clz_r - __dn)); *__result.__seg_ &= ~__m; *__result.__seg_ |= __b << __result.__ctz_; @@ -526,7 +526,7 @@ // do first word if (__last.__ctz_ != 0) { - difference_type __dn = _STD::min(static_cast<difference_type>(__last.__ctz_), __n); + difference_type __dn = _VSTD::min(static_cast<difference_type>(__last.__ctz_), __n); __n -= __dn; unsigned __clz = __bits_per_word - __last.__ctz_; __storage_type __m = (~__storage_type(0) << (__last.__ctz_ - __dn)) & (~__storage_type(0) >> __clz); @@ -543,7 +543,7 @@ __storage_type __nw = __n / __bits_per_word; __result.__seg_ -= __nw; __last.__seg_ -= __nw; - _STD::memmove(__result.__seg_, __last.__seg_, __nw * sizeof(__storage_type)); + _VSTD::memmove(__result.__seg_, __last.__seg_, __nw * sizeof(__storage_type)); __n -= __nw * __bits_per_word; // do last word if (__n > 0) @@ -573,13 +573,13 @@ // do first word if (__last.__ctz_ != 0) { - difference_type __dn = _STD::min(static_cast<difference_type>(__last.__ctz_), __n); + difference_type __dn = _VSTD::min(static_cast<difference_type>(__last.__ctz_), __n); __n -= __dn; unsigned __clz_l = __bits_per_word - __last.__ctz_; __storage_type __m = (~__storage_type(0) << (__last.__ctz_ - __dn)) & (~__storage_type(0) >> __clz_l); __storage_type __b = *__last.__seg_ & __m; unsigned __clz_r = __bits_per_word - __result.__ctz_; - __storage_type __ddn = _STD::min(__dn, static_cast<difference_type>(__result.__ctz_)); + __storage_type __ddn = _VSTD::min(__dn, static_cast<difference_type>(__result.__ctz_)); if (__ddn > 0) { __m = (~__storage_type(0) << (__result.__ctz_ - __ddn)) & (~__storage_type(0) >> __clz_r); @@ -623,7 +623,7 @@ __m = ~__storage_type(0) << (__bits_per_word - __n); __storage_type __b = *--__last.__seg_ & __m; unsigned __clz_r = __bits_per_word - __result.__ctz_; - __storage_type __dn = _STD::min(__n, static_cast<difference_type>(__result.__ctz_)); + __storage_type __dn = _VSTD::min(__n, static_cast<difference_type>(__result.__ctz_)); __m = (~__storage_type(0) << (__result.__ctz_ - __dn)) & (~__storage_type(0) >> __clz_r); *__result.__seg_ &= ~__m; *__result.__seg_ |= __b >> (__bits_per_word - __result.__ctz_); @@ -661,7 +661,7 @@ __bit_iterator<_C, false> move(__bit_iterator<_C, _IsConst> __first, __bit_iterator<_C, _IsConst> __last, __bit_iterator<_C, false> __result) { - return _STD::copy(__first, __last, __result); + return _VSTD::copy(__first, __last, __result); } // move_backward @@ -671,7 +671,7 @@ __bit_iterator<_C, false> move_backward(__bit_iterator<_C, _IsConst> __first, __bit_iterator<_C, _IsConst> __last, __bit_iterator<_C, false> __result) { - return _STD::copy(__first, __last, __result); + return _VSTD::copy(__first, __last, __result); } // swap_ranges @@ -692,7 +692,7 @@ if (__first.__ctz_ != 0) { unsigned __clz = __bits_per_word - __first.__ctz_; - difference_type __dn = _STD::min(static_cast<difference_type>(__clz), __n); + difference_type __dn = _VSTD::min(static_cast<difference_type>(__clz), __n); __n -= __dn; __storage_type __m = (~__storage_type(0) << __first.__ctz_) & (~__storage_type(0) >> (__clz - __dn)); __storage_type __b1 = *__first.__seg_ & __m; @@ -742,13 +742,13 @@ if (__first.__ctz_ != 0) { unsigned __clz_f = __bits_per_word - __first.__ctz_; - difference_type __dn = _STD::min(static_cast<difference_type>(__clz_f), __n); + difference_type __dn = _VSTD::min(static_cast<difference_type>(__clz_f), __n); __n -= __dn; __storage_type __m = (~__storage_type(0) << __first.__ctz_) & (~__storage_type(0) >> (__clz_f - __dn)); __storage_type __b1 = *__first.__seg_ & __m; *__first.__seg_ &= ~__m; unsigned __clz_r = __bits_per_word - __result.__ctz_; - __storage_type __ddn = _STD::min<__storage_type>(__dn, __clz_r); + __storage_type __ddn = _VSTD::min<__storage_type>(__dn, __clz_r); __m = (~__storage_type(0) << __result.__ctz_) & (~__storage_type(0) >> (__clz_r - __ddn)); __storage_type __b2 = *__result.__seg_ & __m; *__result.__seg_ &= ~__m; @@ -803,7 +803,7 @@ __m = ~__storage_type(0) >> (__bits_per_word - __n); __storage_type __b1 = *__first.__seg_ & __m; *__first.__seg_ &= ~__m; - __storage_type __dn = _STD::min<__storage_type>(__n, __clz_r); + __storage_type __dn = _VSTD::min<__storage_type>(__n, __clz_r); __m = (~__storage_type(0) << __result.__ctz_) & (~__storage_type(0) >> (__clz_r - __dn)); __storage_type __b2 = *__result.__seg_ & __m; *__result.__seg_ &= ~__m; @@ -877,13 +877,13 @@ if (__d1 <= __bit_array<_C>::capacity()) { __bit_array<_C> __b(__d1); - _STD::copy(__first, __middle, __b.begin()); - _STD::copy(__b.begin(), __b.end(), _STD::copy(__middle, __last, __first)); + _VSTD::copy(__first, __middle, __b.begin()); + _VSTD::copy(__b.begin(), __b.end(), _VSTD::copy(__middle, __last, __first)); break; } else { - __bit_iterator<_C, false> __mp = _STD::swap_ranges(__first, __middle, __middle); + __bit_iterator<_C, false> __mp = _VSTD::swap_ranges(__first, __middle, __middle); __first = __middle; __middle = __mp; __d2 -= __d1; @@ -894,14 +894,14 @@ if (__d2 <= __bit_array<_C>::capacity()) { __bit_array<_C> __b(__d2); - _STD::copy(__middle, __last, __b.begin()); - _STD::copy_backward(__b.begin(), __b.end(), _STD::copy_backward(__first, __middle, __last)); + _VSTD::copy(__middle, __last, __b.begin()); + _VSTD::copy_backward(__b.begin(), __b.end(), _VSTD::copy_backward(__first, __middle, __last)); break; } else { __bit_iterator<_C, false> __mp = __first + __d2; - _STD::swap_ranges(__first, __mp, __middle); + _VSTD::swap_ranges(__first, __mp, __middle); __first = __mp; __d1 -= __d2; } @@ -928,12 +928,12 @@ if (__first1.__ctz_ != 0) { unsigned __clz_f = __bits_per_word - __first1.__ctz_; - difference_type __dn = _STD::min(static_cast<difference_type>(__clz_f), __n); + difference_type __dn = _VSTD::min(static_cast<difference_type>(__clz_f), __n); __n -= __dn; __storage_type __m = (~__storage_type(0) << __first1.__ctz_) & (~__storage_type(0) >> (__clz_f - __dn)); __storage_type __b = *__first1.__seg_ & __m; unsigned __clz_r = __bits_per_word - __first2.__ctz_; - __storage_type __ddn = _STD::min<__storage_type>(__dn, __clz_r); + __storage_type __ddn = _VSTD::min<__storage_type>(__dn, __clz_r); __m = (~__storage_type(0) << __first2.__ctz_) & (~__storage_type(0) >> (__clz_r - __ddn)); if (__first2.__ctz_ > __first1.__ctz_) if ((*__first2.__seg_ & __m) != (__b << (__first2.__ctz_ - __first1.__ctz_))) @@ -972,7 +972,7 @@ { __m = ~__storage_type(0) >> (__bits_per_word - __n); __storage_type __b = *__first1.__seg_ & __m; - __storage_type __dn = _STD::min(__n, static_cast<difference_type>(__clz_r)); + __storage_type __dn = _VSTD::min(__n, static_cast<difference_type>(__clz_r)); __m = (~__storage_type(0) << __first2.__ctz_) & (~__storage_type(0) >> (__clz_r - __dn)); if ((*__first2.__seg_ & __m) != (__b << __first2.__ctz_)) return false; @@ -1006,7 +1006,7 @@ if (__first1.__ctz_ != 0) { unsigned __clz = __bits_per_word - __first1.__ctz_; - difference_type __dn = _STD::min(static_cast<difference_type>(__clz), __n); + difference_type __dn = _VSTD::min(static_cast<difference_type>(__clz), __n); __n -= __dn; __storage_type __m = (~__storage_type(0) << __first1.__ctz_) & (~__storage_type(0) >> (__clz - __dn)); if ((*__first2.__seg_ & __m) != (*__first1.__seg_ & __m)) 